Merge customProperties/clientInfo/initSql when loading config from multiple places#130
Merged
rbygrave merged 2 commits intoebean-orm:masterfrom Apr 23, 2025
Merged
Conversation
…ltiple places When a config is loaded with loadSettings from different places, the behaviour of customProperties/clientInfo/initSql is not consistent setDefaults did not honor clientInfo / initSql at all. multiple loadSettings should merge customProps/clientInfo/initSql Old behaviour: - initSql is always overwritten - customProps are overwritten, if value is present in config (even if it was empty) - clientInfo is only overwrtitten when configured in properties New behaviour: - all of them are merged. So multiple loadSettings will append initSql or put all props to clientInfo/customProps btw: initSql also supports "delimiter $$"
rbygrave
approved these changes
Apr 23, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When a config is loaded with loadSettings from different places or using setDefaults, the behaviour of customProperties/clientInfo/initSql is not consistent
setDefaults did not honor clientInfo / initSql at all.
multiple loadSettings should merge customProps/clientInfo/initSql Old behaviour:
New behaviour:
btw: initSql also supports "delimiter $$"